From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 21 Apr 2001 19:50:38 +0000 (+0000)
Subject: (wait_reading_process_input) [!subprocesses]: Don't
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~40625
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d4789ac955da360d570355fc8f66305c6318a0e4;p=emacs.git

(wait_reading_process_input) [!subprocesses]: Don't
reference waiting_for_user_input_p, it's not defined in the branch
without async subprocesses support.
---

diff --git a/src/process.c b/src/process.c
index 35e67c45f9e..15fc26c6634 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4916,28 +4916,14 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
 
       /* Check for keyboard input */
 
-      if (XINT (read_kbd) != 0)
+      if ((XINT (read_kbd) != 0)
+	  && detect_input_pending_run_timers (do_display))
 	{
-	  int old_timers_run = timers_run;
-	  int leave = 0;
-	
+	  swallow_events (do_display);
 	  if (detect_input_pending_run_timers (do_display))
-	    {
-	      swallow_events (do_display);
-	      if (detect_input_pending_run_timers (do_display))
-		leave = 1;
-	    }
-
-	  /* If a timer has run, this might have changed buffers
-	     an alike.  Make read_key_sequence aware of that.  */
-	  if (timers_run != old_timers_run
-	      && waiting_for_user_input_p == -1)
-	    record_asynch_buffer_change ();
-
-	  if (leave)
 	    break;
-	}    
-      
+	}
+
       /* If there is unread keyboard input, also return.  */
       if (XINT (read_kbd) != 0
 	  && requeued_events_pending_p ())